removing if else conditions